<!DOCTYPE html><html lang="en" data-theme="light"><head><meta charset="UTF-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1.0,viewport-fit=cover"><title>【SVN】安装使用与IDEA集成 | ChenWeiHui's Blog</title><meta name="author" content="cwh"><meta name="copyright" content="cwh"><meta name="format-detection" content="telephone=no"><meta name="theme-color" content="#ffffff"><meta name="description" content="SVN介绍简介​        SVN全称Subversion，是一个开放源代码的版本控制系统，Subversion 在 2000 年由 CollabNet Inc 开发现在发展成为 Apache 软件基金会的一个项目，同样是一个丰富的开发者和用户社区的一部分。 ​        SVN是一个开放源代码的版本控制系统，管理着随时间改变的数据。这些数据放置在一个中央资料档案库(repository)">
<meta property="og:type" content="article">
<meta property="og:title" content="【SVN】安装使用与IDEA集成">
<meta property="og:url" content="https://gitee.com/CWH6/2023/05/22/%E3%80%90SVN%E3%80%91%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8%E4%B8%8EIDEA%E9%9B%86%E6%88%90/index.html">
<meta property="og:site_name" content="ChenWeiHui&#39;s Blog">
<meta property="og:description" content="SVN介绍简介​        SVN全称Subversion，是一个开放源代码的版本控制系统，Subversion 在 2000 年由 CollabNet Inc 开发现在发展成为 Apache 软件基金会的一个项目，同样是一个丰富的开发者和用户社区的一部分。 ​        SVN是一个开放源代码的版本控制系统，管理着随时间改变的数据。这些数据放置在一个中央资料档案库(repository)">
<meta property="og:locale" content="en_US">
<meta property="og:image" content="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/xhs.png">
<meta property="article:published_time" content="2023-05-22T12:13:26.000Z">
<meta property="article:modified_time" content="2023-05-23T13:58:08.661Z">
<meta property="article:author" content="cwh">
<meta name="twitter:card" content="summary">
<meta name="twitter:image" content="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/xhs.png"><link rel="shortcut icon" href="/bk/img/jljy3.png"><link rel="canonical" href="https://gitee.com/CWH6/2023/05/22/%E3%80%90SVN%E3%80%91%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8%E4%B8%8EIDEA%E9%9B%86%E6%88%90/index.html"><link rel="preconnect" href="//cdn.jsdelivr.net"/><link rel="preconnect" href="//busuanzi.ibruce.info"/><link rel="stylesheet" href="/bk/css/index.css"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free/css/all.min.css" media="print" onload="this.media='all'"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fancyapps/ui/dist/fancybox/fancybox.min.css" media="print" onload="this.media='all'"><script>const GLOBAL_CONFIG = { 
  root: '/bk/',
  algolia: undefined,
  localSearch: undefined,
  translate: undefined,
  noticeOutdate: undefined,
  highlight: {"plugin":"highlighjs","highlightCopy":true,"highlightLang":true,"highlightHeightLimit":false},
  copy: {
    success: 'Copy successfully',
    error: 'Copy error',
    noSupport: 'The browser does not support'
  },
  relativeDate: {
    homepage: false,
    post: false
  },
  runtime: '',
  dateSuffix: {
    just: 'Just',
    min: 'minutes ago',
    hour: 'hours ago',
    day: 'days ago',
    month: 'months ago'
  },
  copyright: undefined,
  lightbox: 'fancybox',
  Snackbar: undefined,
  source: {
    justifiedGallery: {
      js: 'https://cdn.jsdelivr.net/npm/flickr-justified-gallery/dist/fjGallery.min.js',
      css: 'https://cdn.jsdelivr.net/npm/flickr-justified-gallery/dist/fjGallery.min.css'
    }
  },
  isPhotoFigcaption: false,
  islazyload: false,
  isAnchor: false,
  percent: {
    toc: true,
    rightside: false,
  }
}</script><script id="config-diff">var GLOBAL_CONFIG_SITE = {
  title: '【SVN】安装使用与IDEA集成',
  isPost: true,
  isHome: false,
  isHighlightShrink: false,
  isToc: true,
  postUpdate: '2023-05-23 21:58:08'
}</script><noscript><style type="text/css">
  #nav {
    opacity: 1
  }
  .justified-gallery img {
    opacity: 1
  }

  #recent-posts time,
  #post-meta time {
    display: inline !important
  }
</style></noscript><script>(win=>{
    win.saveToLocal = {
      set: function setWithExpiry(key, value, ttl) {
        if (ttl === 0) return
        const now = new Date()
        const expiryDay = ttl * 86400000
        const item = {
          value: value,
          expiry: now.getTime() + expiryDay,
        }
        localStorage.setItem(key, JSON.stringify(item))
      },

      get: function getWithExpiry(key) {
        const itemStr = localStorage.getItem(key)

        if (!itemStr) {
          return undefined
        }
        const item = JSON.parse(itemStr)
        const now = new Date()

        if (now.getTime() > item.expiry) {
          localStorage.removeItem(key)
          return undefined
        }
        return item.value
      }
    }
  
    win.getScript = url => new Promise((resolve, reject) => {
      const script = document.createElement('script')
      script.src = url
      script.async = true
      script.onerror = reject
      script.onload = script.onreadystatechange = function() {
        const loadState = this.readyState
        if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
        script.onload = script.onreadystatechange = null
        resolve()
      }
      document.head.appendChild(script)
    })
  
    win.getCSS = (url,id = false) => new Promise((resolve, reject) => {
      const link = document.createElement('link')
      link.rel = 'stylesheet'
      link.href = url
      if (id) link.id = id
      link.onerror = reject
      link.onload = link.onreadystatechange = function() {
        const loadState = this.readyState
        if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
        link.onload = link.onreadystatechange = null
        resolve()
      }
      document.head.appendChild(link)
    })
  
      win.activateDarkMode = function () {
        document.documentElement.setAttribute('data-theme', 'dark')
        if (document.querySelector('meta[name="theme-color"]') !== null) {
          document.querySelector('meta[name="theme-color"]').setAttribute('content', '#0d0d0d')
        }
      }
      win.activateLightMode = function () {
        document.documentElement.setAttribute('data-theme', 'light')
        if (document.querySelector('meta[name="theme-color"]') !== null) {
          document.querySelector('meta[name="theme-color"]').setAttribute('content', '#ffffff')
        }
      }
      const t = saveToLocal.get('theme')
    
          if (t === 'dark') activateDarkMode()
          else if (t === 'light') activateLightMode()
        
      const asideStatus = saveToLocal.get('aside-status')
      if (asideStatus !== undefined) {
        if (asideStatus === 'hide') {
          document.documentElement.classList.add('hide-aside')
        } else {
          document.documentElement.classList.remove('hide-aside')
        }
      }
    
    const detectApple = () => {
      if(/iPad|iPhone|iPod|Macintosh/.test(navigator.userAgent)){
        document.documentElement.classList.add('apple')
      }
    }
    detectApple()
    })(window)</script><meta name="generator" content="Hexo 5.4.2"></head><body><div id="web_bg"></div><div id="sidebar"><div id="menu-mask"></div><div id="sidebar-menus"><div class="avatar-img is-center"><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/xhs.png" onerror="onerror=null;src='/img/friend_404.gif'" alt="avatar"/></div><div class="sidebar-site-data site-data is-center"><a href="/bk/archives/"><div class="headline">Articles</div><div class="length-num">66</div></a><a href="/bk/tags/"><div class="headline">Tags</div><div class="length-num">33</div></a><a href="/bk/categories/"><div class="headline">Categories</div><div class="length-num">8</div></a></div><hr/><div class="menus_items"><div class="menus_item"><a class="site-page" href="/bk/"><i class="fa-fw fas fa-home"></i><span> 主页</span></a></div><div class="menus_item"><a class="site-page" href="/bk/archives/"><i class="fa-fw fas fa-archive"></i><span> 归档</span></a></div><div class="menus_item"><a class="site-page" href="/bk/tags/"><i class="fa-fw fas fa-tags"></i><span> 标签</span></a></div><div class="menus_item"><a class="site-page" href="/bk/categories/"><i class="fa-fw fas fa-folder-open"></i><span> 分类</span></a></div><div class="menus_item"><a class="site-page group" href="javascript:void(0);"><i class="fa-fw fas fa-list"></i><span> List</span><i class="fas fa-chevron-down"></i></a><ul class="menus_item_child"><li><a class="site-page child" href="/bk/music/"><i class="fa-fw fas fa-music"></i><span> 音乐</span></a></li><li><a class="site-page child" href="/bk/movies/"><i class="fa-fw fas fa-video"></i><span> 电影</span></a></li></ul></div><div class="menus_item"><a class="site-page" href="/bk/link/"><i class="fa-fw fas fa-link"></i><span> 友链</span></a></div><div class="menus_item"><a class="site-page" href="/bk/about/"><i class="fa-fw fas fa-heart"></i><span> 关于</span></a></div></div></div></div><div class="post" id="body-wrap"><header class="post-bg" id="page-header" style="background-image: url('/bk/img/alone_blue_sky.jpg')"><nav id="nav"><span id="blog-info"><a href="/bk/" title="ChenWeiHui's Blog"><span class="site-name">ChenWeiHui's Blog</span></a></span><div id="menus"><div class="menus_items"><div class="menus_item"><a class="site-page" href="/bk/"><i class="fa-fw fas fa-home"></i><span> 主页</span></a></div><div class="menus_item"><a class="site-page" href="/bk/archives/"><i class="fa-fw fas fa-archive"></i><span> 归档</span></a></div><div class="menus_item"><a class="site-page" href="/bk/tags/"><i class="fa-fw fas fa-tags"></i><span> 标签</span></a></div><div class="menus_item"><a class="site-page" href="/bk/categories/"><i class="fa-fw fas fa-folder-open"></i><span> 分类</span></a></div><div class="menus_item"><a class="site-page group" href="javascript:void(0);"><i class="fa-fw fas fa-list"></i><span> List</span><i class="fas fa-chevron-down"></i></a><ul class="menus_item_child"><li><a class="site-page child" href="/bk/music/"><i class="fa-fw fas fa-music"></i><span> 音乐</span></a></li><li><a class="site-page child" href="/bk/movies/"><i class="fa-fw fas fa-video"></i><span> 电影</span></a></li></ul></div><div class="menus_item"><a class="site-page" href="/bk/link/"><i class="fa-fw fas fa-link"></i><span> 友链</span></a></div><div class="menus_item"><a class="site-page" href="/bk/about/"><i class="fa-fw fas fa-heart"></i><span> 关于</span></a></div></div><div id="toggle-menu"><a class="site-page" href="javascript:void(0);"><i class="fas fa-bars fa-fw"></i></a></div></div></nav><div id="post-info"><h1 class="post-title">【SVN】安装使用与IDEA集成</h1><div id="post-meta"><div class="meta-firstline"><span class="post-meta-date"><i class="far fa-calendar-alt fa-fw post-meta-icon"></i><span class="post-meta-label">Created</span><time class="post-meta-date-created" datetime="2023-05-22T12:13:26.000Z" title="Created 2023-05-22 20:13:26">2023-05-22</time><span class="post-meta-separator">|</span><i class="fas fa-history fa-fw post-meta-icon"></i><span class="post-meta-label">Updated</span><time class="post-meta-date-updated" datetime="2023-05-23T13:58:08.661Z" title="Updated 2023-05-23 21:58:08">2023-05-23</time></span></div><div class="meta-secondline"><span class="post-meta-separator">|</span><span class="post-meta-pv-cv" id="" data-flag-title="【SVN】安装使用与IDEA集成"><i class="far fa-eye fa-fw post-meta-icon"></i><span class="post-meta-label">Post View:</span><span id="busuanzi_value_page_pv"><i class="fa-solid fa-spinner fa-spin"></i></span></span></div></div></div></header><main class="layout" id="content-inner"><div id="post"><article class="post-content" id="article-container"><h2 id="SVN介绍"><a href="#SVN介绍" class="headerlink" title="SVN介绍"></a>SVN介绍</h2><h3 id="简介"><a href="#简介" class="headerlink" title="简介"></a>简介</h3><p>​        SVN全称Subversion，是一个开放源代码的版本控制系统，Subversion 在 2000 年由 CollabNet Inc 开发现在发展成为 Apache 软件基金会的一个项目，同样是一个丰富的开发者和用户社区的一部分。</p>
<p>​        SVN是一个开放源代码的<strong>版本控制系统</strong>，管理着随时间改变的数据。这些数据放置在一个中央资料档案库(repository)中。这个档案库很像一个普通的文件服务器,不过它会记住每一次文件的变动。这样你就可以把档案恢复到旧的版本,或是浏览文件的变动历史。说得简单一点SVN就是<strong>用于多个人共同开发同一个项目，共用资源的目的</strong>。</p>
<h3 id="基本概念"><a href="#基本概念" class="headerlink" title="基本概念"></a>基本概念</h3><ul>
<li>Repository(源代码库): 源代码统一存放的地方</li>
<li>Checkout (提取): 当你手上没有源代码的时候，你需要从repository checkout一份。</li>
<li>Commit (提交): 当你已经修改了代码，你就需要Commit到repository</li>
<li>Update(更新):  当你已经Checkout了一份源代码，Update后就可以和Repository上的源代码同步</li>
</ul>
<h3 id="工作流程"><a href="#工作流程" class="headerlink" title="工作流程"></a>工作流程</h3><p>开始新一天的工作</p>
<p>1、从服务器<strong>下载项目组最新代码</strong>。(Checkout)</p>
<p>2、如果已经Checkout并且有人已Commit了代码，你可以<strong>更新以获得最新代码</strong>。 (Update)</p>
<p>3、<strong>进入自己的分支，进行工作，每隔一个小时向服务器自己的分支提交一次代码</strong>(很多人都有这个习惯。因为有时候自己对代码改来改去，最后又想还原到前一个小时的版本，或者看看前一个小时自己修改了哪些代码，就需要这样做了)(Commit)</p>
<p>4、<strong>下班时间快到了，把自己的分支合并到服务器主分支上，一天的工作完成，并反映给服务器</strong>(Commit)注意:如果两个程序员同时修改了同一个文件，SVN可以合并这两个程序员的改动，实际上SVN管理源代码是以行为单位的，就是说两个程序员只要不是修改了同一行程序，SVN都会自动合并两种修改。<strong>如果是同一行，SVN会提示文件Confict冲突，需要手动确认</strong>。</p>
<p>​    </p>
<h2 id="安装配置"><a href="#安装配置" class="headerlink" title="安装配置"></a>安装配置</h2><h3 id="服务端"><a href="#服务端" class="headerlink" title="服务端"></a>服务端</h3><h4 id="下载"><a href="#下载" class="headerlink" title="下载"></a>下载</h4><p><a target="_blank" rel="noopener" href="https://www.visualsvn.com/downloads/">https://www.visualsvn.com/downloads/</a></p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522204354906.png" alt="image-20230522204354906" style="zoom:67%;" />

<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522204917293.png" alt="image-20230522204917293"></p>
<h4 id="安装"><a href="#安装" class="headerlink" title="安装"></a>安装</h4><p>1.双击安装程序 VisualSVN-Server-5.1.4-x64.msi</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522205101089.png" alt="image-20230522205101089" style="zoom:67%;" />

<p>2、勾选复选框选择同意，然后选择 Next，选择 Upgrade</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522205353582.png" alt="image-20230522205353582" style="zoom:67%;" />

<p>3、选择默认配置，选择Next</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522205452579.png" alt="image-20230522205452579" style="zoom:67%;" />

<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522210245679.png" alt="image-20230522210245679" style="zoom:67%;" />

<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522210351823.png" alt="image-20230522210351823" style="zoom:67%;" />

<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522210638368.png" alt="image-20230522210638368" style="zoom:67%;" />

<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522210757861.png" alt="image-20230522210757861" style="zoom: 67%;" />

<p>安装完成如下图：</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522210946358.png" alt="image-20230522210946358" style="zoom: 50%;" />

<h4 id="配置"><a href="#配置" class="headerlink" title="配置"></a>配置</h4><p>​    说明:服务器端需要提供IP、端口、帐号、密码供客户端使用。即有如下配置</p>
<h5 id="设置IP和端口"><a href="#设置IP和端口" class="headerlink" title="设置IP和端口"></a>设置IP和端口</h5><p>1.打开服务器，点击 VisualSVN Server，选择 Configure authentication options…</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522212218490.png" alt="image-20230522212218490" style="zoom: 67%;" />

<p>2.设置Server name，建议使用当前IP</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522212334979.png" alt="image-20230522212334979" style="zoom:67%;" />

<p>注意</p>
<blockquote>
<p>Server name的值可以设置为:<br>1、127.0.0.1 (只能本地自己访问)</p>
<p>2、电脑用户名 (只能本地自己访问)</p>
<p>3、当前IP(能够拼通IP的用户均可访问,IPV4) Server Port使用默认值即可</p>
<p>查看当前IP:<br>        打开dos窗口(windows+R键)，输入ipconfig，按回车</p>
</blockquote>
<h5 id="新建账号密码"><a href="#新建账号密码" class="headerlink" title="新建账号密码"></a>新建账号密码</h5><p>1、右键左侧菜单 User , 选择Create User</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522212811999.png" alt="image-20230522212811999" style="zoom:80%;" />

<p>2、设置用户的账户和密码</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522212919581.png" alt="image-20230522212919581" style="zoom:80%;" />

<h5 id="新建分组"><a href="#新建分组" class="headerlink" title="新建分组"></a>新建分组</h5><p>1.选择 Group 右键，选择 Create Group…</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522213041559.png" alt="image-20230522213041559" style="zoom: 67%;" />

<p>2.设置分组名称，及为分组添加用户</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522213135572.png" alt="image-20230522213135572"></p>
<h5 id="查看资源"><a href="#查看资源" class="headerlink" title="查看资源"></a>查看资源</h5><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522213315347.png" alt="image-20230522213315347" style="zoom: 67%;" />



<h4 id="使用"><a href="#使用" class="headerlink" title="使用"></a>使用</h4><h5 id="新建版本库"><a href="#新建版本库" class="headerlink" title="新建版本库"></a>新建版本库</h5><p>1.选择 Repositories 右键，选择 Create New Repository…</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522213459330.png" alt="image-20230522213459330" style="zoom:80%;" />

<p>2.选择默认设置，选择下一步，设置仓库名称</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522213629863.png" alt="image-20230522213629863" style="zoom: 80%;" />

<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522213706347.png" alt="image-20230522213706347" style="zoom:80%;" />

<p>3.设置仓库目录(选择任意一个选项都可)</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522213752238.png" alt="image-20230522213752238" style="zoom:80%;" />

<p>4.设置仓库的访问权限(速里设置所有svn用户都有读/写权限)</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522213848218.png" alt="image-20230522213848218" style="zoom:80%;" />

<p>5.仓库创建完成</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522213955491.png" alt="image-20230522213955491" style="zoom:80%;" />

<h5 id="签入项目到SVN（import）"><a href="#签入项目到SVN（import）" class="headerlink" title="签入项目到SVN（import）"></a>签入项目到SVN（import）</h5><p>1、拷贝远程仓库的地址</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522214852649.png" alt="image-20230522214852649" style="zoom:80%;" />

<p>2、选择任意项目，右键选择TortoiseSVN，选择import</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522214957475.png" alt="image-20230522214957475"></p>
<p>3.将上一步拷贝的仓库地址粘贴到地址栏</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522215033161.png" alt="image-20230522215033161" style="zoom:80%;" />

<p>​    4.选择永久接受</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522215137657.png" alt="image-20230522215137657" style="zoom: 80%;" />

<pre><code> 5. 输入用户账号和密码
</code></pre>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522215237762.png" alt="image-20230522215237762"></p>
<p>6、导入成功</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522215305062.png" alt="image-20230522215305062" style="zoom:80%;" />

<p>7.仓库右键，选择刷新，在服务器中看到的效果</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522215353956.png" alt="image-20230522215353956" style="zoom: 67%;" />



<h3 id="客户端"><a href="#客户端" class="headerlink" title="客户端"></a>客户端</h3><h4 id="下载-1"><a href="#下载-1" class="headerlink" title="下载"></a>下载</h4><p><a target="_blank" rel="noopener" href="https://tortoisesvn.net/downloads.html">https://tortoisesvn.net/downloads.html</a></p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522204719713.png" alt="image-20230522204719713" style="zoom: 50%;" />

<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522205019891.png" alt="image-20230522205019891"></p>
<h4 id="安装-1"><a href="#安装-1" class="headerlink" title="安装"></a>安装</h4><p>1、双击安装程序 TortoiseSVN-1.13.1.28686-x64-svn-1.13.0.msi</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522211114120.png" alt="image-20230522211114120" style="zoom: 80%;" />

<p>2、选择Next，然后勾选 command line client tools，选择 Next</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522211303818.png" alt="image-20230522211303818" style="zoom: 80%;" />

<p>3.设置TortoiseSVN的安装路径，勾选command line client tools ， <strong>IDEA集成SVN需要这个工具</strong></p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522211613991.png" alt="image-20230522211613991" style="zoom: 80%;" />

<p>4进入到TortoiseSVN软件使用协议界面，直接选择Install 进行安装</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522211703563.png" alt="image-20230522211703563" style="zoom: 80%;" />

<p>5.安装完成之后，直接选择 Finish 即可</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522211803986.png" alt="image-20230522211803986" style="zoom:80%;" />

<p>6.在任意空白地方，右键，出现如下内容，则表示安装成功</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522211854341.png" alt="image-20230522211854341" style="zoom:80%;" />

<h4 id="使用-1"><a href="#使用-1" class="headerlink" title="使用"></a>使用</h4><h5 id="检索项目（check-out）"><a href="#检索项目（check-out）" class="headerlink" title="检索项目（check out）"></a>检索项目（check out）</h5><p>1.复制要下载的项目的远程地址</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522215758792.png" alt="image-20230522215758792" style="zoom: 67%;" />

<p>2.在需要检索项目的目录中，右键选择 SVN Checkout..</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522220230087.png" alt="image-20230522220230087"></p>
<p>3.输入远程地址，设置项目的存放位置</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522220328062.png" alt="image-20230522220328062" style="zoom:80%;" />

<p>4、检索完成</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522220412158.png" alt="image-20230522220412158" style="zoom: 80%;" />



<h5 id="提交代码-commit"><a href="#提交代码-commit" class="headerlink" title="提交代码 (commit)"></a>提交代码 (commit)</h5><p>1.新建文件，右键选择 TortoiseSVN，选择 Add，将文件添加到版本库列表</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522220536791.png" alt="image-20230522220536791" style="zoom:80%;" />

<p>2.再次点击文件，右键，会出现 SVN Commit…</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522220831071.png" alt="image-20230522220831071" style="zoom:67%;" />

<p>3.提交成功</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522220913444.png" alt="image-20230522220913444" style="zoom:80%;" />



<h5 id="更新代码（update）"><a href="#更新代码（update）" class="headerlink" title="更新代码（update）"></a>更新代码（update）</h5><p>1.如果当前资源不是最新版本，则可在项目中空白地方右键，选择SVN Update</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522221111551.png" alt="image-20230522221111551" style="zoom:67%;" />

<p>2、更新成功</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522221153937.png" alt="image-20230522221153937" style="zoom:80%;" />

<h5 id="版本冲突问题"><a href="#版本冲突问题" class="headerlink" title="版本冲突问题"></a>版本冲突问题</h5><p><strong>原因</strong></p>
<p>​        假设A、B两个用户都在版本号为100的时候，更新了kingtuns.txt这个文件，A用户在修改完成之后提交kingtuns.txt到服务器，这个时候提交成功，这个时候kingtuns.txt文件的版本号已经变成101了。同时B用户在版本号为100的kingtuns.txt文件上作修改，修改完成之后提交到服务器时，由于不是在当前最新的101版本上作的修改，所以导致提交失败。此时用户B去更新文件，<strong>如果B用户和A用户修改了文件的同一行代码，就会出现冲突</strong></p>
<p><strong>版本冲突现象</strong></p>
<p>​        冲突发生时，subversion会在当前工作目录中保存所有的目标文件版本[上次更新版本、当前获取的版本(即别<br>人提交的版本)、自己更新的版本、目标文件]。</p>
<p>假设文件名是kingtuns.txt<br>    对应的文件名分别是:<br>        kingtuns.txt.r101<br>        kingtuns.txt.r102<br>        kingtuns.txt.mine<br>        kingtuns.txt<br>同时在目标文件中标记来自不同用户的更改</p>
<p><strong>版本冲突解决</strong></p>
<p>场景</p>
<p>1.现在A、B两个用户都更新项目文件到本地</p>
<p>用户A</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522221739948.png" alt="image-20230522221739948" style="zoom: 50%;" />

<p>用户B</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522221901159.png" alt="image-20230522221901159" style="zoom:67%;" />

<p>2.项目中的hello.txt 文件原始内容为</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522222142644.png" alt="image-20230522222142644"></p>
<p>3.A用户修改文件，添加内容“A用户修改内容”，完成后提交到服务器</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522222213959.png" alt="image-20230522222213959"></p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522222817620.png" alt="image-20230522222817620"></p>
<p>4、B用户修改文件，添加内容“B用户修改内容”，完成后提交到服务器</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522222845428.png" alt="image-20230522222845428"></p>
<p>5、B用户提交更新至服务器时提示如下</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522222915691.png" alt="image-20230522222915691"></p>
<p>6、B用户将文件提交至服务器时，提示版本过期:首先应该从版本库更新版本，然后去解决冲突，冲突解决后要执行svn resolved(解决)，然后在签入到版本库。在冲突解决之后，需要使用svn resolved (解来告诉subversion冲突解决，这样才能提交更新。</p>
<p><strong>解决冲突的三种选择</strong></p>
<p>1.<strong>放弃自己的更新</strong>，使用svn revert (回滚)，然后提交。在这种方式下不需要使用svn resolved (解决)</p>
<p>2.<strong>放奔自己的更新</strong>，使用别人的更新。使用最新获取的版本覆盖目标文件，执行resolved filename并提交(选择<br>文件一右键一解决)</p>
<p>3.<strong>手动解决</strong>:冲突发生时，通过和其他用户沟通之后，手动更新目标文件。然后执行resolved filename来解阶<br>冲突，最后提交。</p>
<p><strong>解决冲突实践</strong></p>
<p>1.在B用户当前目录下，右键选择”SVN Update”，执行“update”(更新)操作</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522225305080.png" alt="image-20230522225305080" style="zoom:80%;" />

<p>2.B用户中的 Hello.txt 文件出现冲突</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522225354112.png" alt="image-20230522225354112" style="zoom:80%;" />

<p>3、在冲突的文件上（选中文件—右键菜单-TortoiseSVN–Edit conflicts（解决冲突））</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522225653364.png" alt="image-20230522225653364" style="zoom:80%;" />

<p>4、打开编辑冲突的窗口</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522225754028.png" alt="image-20230522225754028" style="zoom:67%;" />

<figure class="highlight java"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br><span class="line">3</span><br></pre></td><td class="code"><pre><span class="line">Theirs窗口为服务器上当前最新版本</span><br><span class="line">Mine窗口为本地修改后的版本</span><br><span class="line">Merged窗口为合并后的文件内容显示</span><br></pre></td></tr></table></figure>

<p>5.如果要使用服务器版本，在Theirs窗口选中差异内容，右键，选择Use this text block (使用这段文本块)<br>同理如果要使用本地版本，在协商后，在Mine窗口右键，选择Use this text block (使用这段文本块)。</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522230024832.png" alt="image-20230522230024832"></p>
<p>6.修改完成后，选择”Markas resolved”(标记为解决)，然后选择Save”(保存文件)，关闭窗口即可</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522230105301.png" alt="image-20230522230105301"></p>
<p>7.此时，当前冲突已解决，可再次选择“SVN Commit”提交文件</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522230136137.png" alt="image-20230522230136137"></p>
<blockquote>
<p>注:也可先不标记为解决，直接保存文件后,在B用户的冲突目录下，选中文件一右键菜单-TortoiseSVN-Resolved (解决)。然后再提交文件。</p>
</blockquote>
<p><strong>如何降低冲突解决的复杂度</strong><br>1.当文档编辑完成后，尽快提交，频繁的提交/更新可以降低在冲突发生的概率，以及发生时解决冲突的复杂度。</p>
<p>2.在提交时，写上明确的message，方便以后查找用户更新的原因，毕竟随着时间的推移，对当初更新的原因有可能会遗忘</p>
<p>3.养成良好的使用习惯，使用SVN时每次都是先提交，后更新。每天早上打开后，首先要从版本库获取最新版本。每天下班前必须将已经编辑过的文档都提交到版本库。</p>
<h2 id="IDEA-集成使用SVN"><a href="#IDEA-集成使用SVN" class="headerlink" title="IDEA 集成使用SVN"></a>IDEA 集成使用SVN</h2><h3 id="配置SVN环境"><a href="#配置SVN环境" class="headerlink" title="配置SVN环境"></a>配置SVN环境</h3><p>1、File—&gt;Ohter Setting (全局配置；Setting是局部配置)—&gt; Version Control —&gt;Subversion</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522230447902.png" alt="image-20230522230447902"></p>
<p>2、配置svn</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522230554226.png" alt="image-20230522230554226"></p>
<blockquote>
<p>找不到svn.exe文件，TortoisesVN的bin目录下面没有svdl exe<br>之所以没有是因为安装TortoiseSVN的时候没有选指定安装项，添加command line client tools</p>
</blockquote>
<p>3、重启IDEA</p>
<h3 id="IDEA-Git转SVN"><a href="#IDEA-Git转SVN" class="headerlink" title="IDEA Git转SVN"></a>IDEA Git转SVN</h3><p>选择setting-&gt; Version Control，新增或者编辑，选择目录，使用git或者svn管理</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522231534938.png" alt="image-20230522231534938"></p>
<h4 id="检索项目"><a href="#检索项目" class="headerlink" title="检索项目"></a>检索项目</h4><p>1.选择VCS -&gt; Checkout from Version Control-&gt; Subversion</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522233637638.png" alt="image-20230522233637638"></p>
<p>2.添加远程仓库中项目的URL</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522233740071.png" alt="image-20230522233740071"></p>
<p>3.点击添加的URL，选择 Checkout</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522233808432.png" alt="image-20230522233808432"></p>
<p>4.选择检索的项目的存放位置</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522233846111.png" alt="image-20230522233846111"></p>
<p>5.选择Destination，根据自己的偏好选择，其他配置默认，单击 OK</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522233917799.png" alt="image-20230522233917799"></p>
<p>6.选择1.8 Format，点击OK</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522233943402.png" alt="image-20230522233943402"></p>
<p>7.已经check out一个项目，是否要打开，选择Yes</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522234008123.png" alt="image-20230522234008123"></p>
<p>8.选择Add</p>
<p><img src="C:/Users/27477/AppData/Roaming/Typora/typora-user-images/image-20230522234041413.png" alt="image-20230522234041413"></p>
<p>9.此时，项目就可以与远程仓库关联</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522234111205.png" alt="image-20230522234111205"></p>
<h4 id="提交代码"><a href="#提交代码" class="headerlink" title="提交代码"></a>提交代码</h4><p>1.选择VCS-&gt;Commit..</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522234143179.png" alt="image-20230522234143179"></p>
<p>2.选择需要提交的文件，填写提交信息，选择Commit</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522234226355.png" alt="image-20230522234226355" style="zoom:80%;" />

<p>3.提交成功后，会在ldea最下面显示提交状态</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522234301427.png" alt="image-20230522234301427"></p>
<blockquote>
<p>注:项目提交前，最好先更新，然后再提交</p>
</blockquote>
<h4 id="更新代码"><a href="#更新代码" class="headerlink" title="更新代码"></a>更新代码</h4><p>1.选择VCS -&gt; Update Project…</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522234420748.png" alt="image-20230522234420748"></p>
<p>2、默认即可，直接选择OK</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522234451997.png" alt="image-20230522234451997"></p>
<p>3.更新成功的提示信息</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522234520710.png" alt="image-20230522234520710"></p>
<h4 id="导入项目"><a href="#导入项目" class="headerlink" title="导入项目"></a>导入项目</h4><p>1.选择VCS-&gt;Import into Version Control -&gt;lmport into Subversion</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522234557749.png" alt="image-20230522234557749"></p>
<p>2.选择“+”添加项目导入的地址(可手动添加一个文件夹，项目中的文件会放置在该文件夹中，文件名自定义</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522234629943.png" alt="image-20230522234629943"></p>
<p>3选择要导入的路径，选择Import</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522234709081.png" alt="image-20230522234709081"></p>
<p>4.选择要导入的项目，点击OK</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522234755490.png" alt="image-20230522234755490"></p>
<p>5.检查导入的路径，填写导入信息，选择OK</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522234830810.png" alt="image-20230522234830810"></p>
<p>6.在远程仓库中检查是否导入成功即可</p>
<h4 id="版本冲突问题-1"><a href="#版本冲突问题-1" class="headerlink" title="版本冲突问题"></a>版本冲突问题</h4><p>1.如果未更新，就提交资源(有其他用户也提交过资源)，则提交失败</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522235208687.png" alt="image-20230522235208687"></p>
<p>2.此时，执行更新操作，将其他人提交过的资源更新到本地，会提示冲突</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522235240406.png" alt="image-20230522235240406"></p>
<p>3.通常选择合并，再选择需要保留的代码，选择好之后选择 Apply</p>
<img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522235344016.png" alt="image-20230522235344016" style="zoom:80%;" />

<p>4.提示更新成功</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522235410787.png" alt="image-20230522235410787"></p>
<p>5.再次选择提交，成功解决冲突</p>
<p><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/image-20230522235429863.png" alt="image-20230522235429863"></p>
</article><div class="post-copyright"><div class="post-copyright__author"><span class="post-copyright-meta">Author: </span><span class="post-copyright-info"><a href="https://gitee.com/CWH6">cwh</a></span></div><div class="post-copyright__type"><span class="post-copyright-meta">Link: </span><span class="post-copyright-info"><a href="https://gitee.com/CWH6/2023/05/22/%E3%80%90SVN%E3%80%91%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8%E4%B8%8EIDEA%E9%9B%86%E6%88%90/">https://gitee.com/CWH6/2023/05/22/%E3%80%90SVN%E3%80%91%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8%E4%B8%8EIDEA%E9%9B%86%E6%88%90/</a></span></div><div class="post-copyright__notice"><span class="post-copyright-meta">Copyright Notice: </span><span class="post-copyright-info">All articles in this blog are licensed under <a target="_blank" rel="noopener" href="https://creativecommons.org/licenses/by-nc-sa/4.0/">CC BY-NC-SA 4.0</a> unless stating additionally.</span></div></div><div class="tag_share"><div class="post-meta__tag-list"></div><div class="post_share"><div class="social-share" data-image="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/xhs.png" data-sites="facebook,twitter,wechat,weibo,qq"></div><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/butterfly-extsrc/sharejs/dist/css/share.min.css" media="print" onload="this.media='all'"><script src="https://cdn.jsdelivr.net/npm/butterfly-extsrc/sharejs/dist/js/social-share.min.js" defer></script></div></div><nav class="pagination-post" id="pagination"><div class="prev-post pull-left"><a href="/bk/2023/05/23/%E3%80%90FreeMarker%E3%80%91FreeMarker/" title="【FreeMarker】FreeMarker"><div class="cover" style="background: var(--default-bg-color)"></div><div class="pagination-info"><div class="label">Previous Post</div><div class="prev_info">【FreeMarker】FreeMarker</div></div></a></div><div class="next-post pull-right"><a href="/bk/2023/05/19/%E3%80%90SpringBoot%E3%80%91SpringBoot%E6%95%B4%E5%90%88Mybatis/" title="【实战】SpringBoot整合Mybatis"><div class="cover" style="background: var(--default-bg-color)"></div><div class="pagination-info"><div class="label">Next Post</div><div class="next_info">【实战】SpringBoot整合Mybatis</div></div></a></div></nav></div><div class="aside-content" id="aside-content"><div class="card-widget card-info"><div class="is-center"><div class="avatar-img"><img src="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/xhs.png" onerror="this.onerror=null;this.src='/bk/img/friend_404.gif'" alt="avatar"/></div><div class="author-info__name">cwh</div><div class="author-info__description">新博客地址：http://cwh6.gitee.io/vuepressv2/</div></div><div class="card-info-data site-data is-center"><a href="/bk/archives/"><div class="headline">Articles</div><div class="length-num">66</div></a><a href="/bk/tags/"><div class="headline">Tags</div><div class="length-num">33</div></a><a href="/bk/categories/"><div class="headline">Categories</div><div class="length-num">8</div></a></div><a id="card-info-btn" target="_blank" rel="noopener" href="https://github.com/xxxxxx"><i class="fab fa-github"></i><span>Follow Me</span></a><div class="card-info-social-icons is-center"><a class="social-icon" href="mailto:2747758546@qq.com" target="_blank" title="Email"><i class="fas fa-envelope" style="color: #4a7dbe;"></i></a><a class="social-icon" href="https://cwh6-bucket.oss-cn-shanghai.aliyuncs.com/bk/wx_self.jpg" target="_blank" title="wx"><i class="fas fa-qq" style="color: #4a7dbe;"></i></a></div></div><div class="card-widget card-announcement"><div class="item-headline"><i class="fas fa-bullhorn fa-shake"></i><span>Announcement</span></div><div class="announcement_content">ありがとう、私の暗い世界の小さな太陽、ありがとう、ずっと温めてくれた</div></div><div class="sticky_layout"><div class="card-widget" id="card-toc"><div class="item-headline"><i class="fas fa-stream"></i><span>Catalog</span><span class="toc-percentage"></span></div><div class="toc-content"><ol class="toc"><li class="toc-item toc-level-2"><a class="toc-link" href="#SVN%E4%BB%8B%E7%BB%8D"><span class="toc-number">1.</span> <span class="toc-text">SVN介绍</span></a><ol class="toc-child"><li class="toc-item toc-level-3"><a class="toc-link" href="#%E7%AE%80%E4%BB%8B"><span class="toc-number">1.1.</span> <span class="toc-text">简介</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#%E5%9F%BA%E6%9C%AC%E6%A6%82%E5%BF%B5"><span class="toc-number">1.2.</span> <span class="toc-text">基本概念</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#%E5%B7%A5%E4%BD%9C%E6%B5%81%E7%A8%8B"><span class="toc-number">1.3.</span> <span class="toc-text">工作流程</span></a></li></ol></li><li class="toc-item toc-level-2"><a class="toc-link" href="#%E5%AE%89%E8%A3%85%E9%85%8D%E7%BD%AE"><span class="toc-number">2.</span> <span class="toc-text">安装配置</span></a><ol class="toc-child"><li class="toc-item toc-level-3"><a class="toc-link" href="#%E6%9C%8D%E5%8A%A1%E7%AB%AF"><span class="toc-number">2.1.</span> <span class="toc-text">服务端</span></a><ol class="toc-child"><li class="toc-item toc-level-4"><a class="toc-link" href="#%E4%B8%8B%E8%BD%BD"><span class="toc-number">2.1.1.</span> <span class="toc-text">下载</span></a></li><li class="toc-item toc-level-4"><a class="toc-link" href="#%E5%AE%89%E8%A3%85"><span class="toc-number">2.1.2.</span> <span class="toc-text">安装</span></a></li><li class="toc-item toc-level-4"><a class="toc-link" href="#%E9%85%8D%E7%BD%AE"><span class="toc-number">2.1.3.</span> <span class="toc-text">配置</span></a><ol class="toc-child"><li class="toc-item toc-level-5"><a class="toc-link" href="#%E8%AE%BE%E7%BD%AEIP%E5%92%8C%E7%AB%AF%E5%8F%A3"><span class="toc-number">2.1.3.1.</span> <span class="toc-text">设置IP和端口</span></a></li><li class="toc-item toc-level-5"><a class="toc-link" href="#%E6%96%B0%E5%BB%BA%E8%B4%A6%E5%8F%B7%E5%AF%86%E7%A0%81"><span class="toc-number">2.1.3.2.</span> <span class="toc-text">新建账号密码</span></a></li><li class="toc-item toc-level-5"><a class="toc-link" href="#%E6%96%B0%E5%BB%BA%E5%88%86%E7%BB%84"><span class="toc-number">2.1.3.3.</span> <span class="toc-text">新建分组</span></a></li><li class="toc-item toc-level-5"><a class="toc-link" href="#%E6%9F%A5%E7%9C%8B%E8%B5%84%E6%BA%90"><span class="toc-number">2.1.3.4.</span> <span class="toc-text">查看资源</span></a></li></ol></li><li class="toc-item toc-level-4"><a class="toc-link" href="#%E4%BD%BF%E7%94%A8"><span class="toc-number">2.1.4.</span> <span class="toc-text">使用</span></a><ol class="toc-child"><li class="toc-item toc-level-5"><a class="toc-link" href="#%E6%96%B0%E5%BB%BA%E7%89%88%E6%9C%AC%E5%BA%93"><span class="toc-number">2.1.4.1.</span> <span class="toc-text">新建版本库</span></a></li><li class="toc-item toc-level-5"><a class="toc-link" href="#%E7%AD%BE%E5%85%A5%E9%A1%B9%E7%9B%AE%E5%88%B0SVN%EF%BC%88import%EF%BC%89"><span class="toc-number">2.1.4.2.</span> <span class="toc-text">签入项目到SVN（import）</span></a></li></ol></li></ol></li><li class="toc-item toc-level-3"><a class="toc-link" href="#%E5%AE%A2%E6%88%B7%E7%AB%AF"><span class="toc-number">2.2.</span> <span class="toc-text">客户端</span></a><ol class="toc-child"><li class="toc-item toc-level-4"><a class="toc-link" href="#%E4%B8%8B%E8%BD%BD-1"><span class="toc-number">2.2.1.</span> <span class="toc-text">下载</span></a></li><li class="toc-item toc-level-4"><a class="toc-link" href="#%E5%AE%89%E8%A3%85-1"><span class="toc-number">2.2.2.</span> <span class="toc-text">安装</span></a></li><li class="toc-item toc-level-4"><a class="toc-link" href="#%E4%BD%BF%E7%94%A8-1"><span class="toc-number">2.2.3.</span> <span class="toc-text">使用</span></a><ol class="toc-child"><li class="toc-item toc-level-5"><a class="toc-link" href="#%E6%A3%80%E7%B4%A2%E9%A1%B9%E7%9B%AE%EF%BC%88check-out%EF%BC%89"><span class="toc-number">2.2.3.1.</span> <span class="toc-text">检索项目（check out）</span></a></li><li class="toc-item toc-level-5"><a class="toc-link" href="#%E6%8F%90%E4%BA%A4%E4%BB%A3%E7%A0%81-commit"><span class="toc-number">2.2.3.2.</span> <span class="toc-text">提交代码 (commit)</span></a></li><li class="toc-item toc-level-5"><a class="toc-link" href="#%E6%9B%B4%E6%96%B0%E4%BB%A3%E7%A0%81%EF%BC%88update%EF%BC%89"><span class="toc-number">2.2.3.3.</span> <span class="toc-text">更新代码（update）</span></a></li><li class="toc-item toc-level-5"><a class="toc-link" href="#%E7%89%88%E6%9C%AC%E5%86%B2%E7%AA%81%E9%97%AE%E9%A2%98"><span class="toc-number">2.2.3.4.</span> <span class="toc-text">版本冲突问题</span></a></li></ol></li></ol></li></ol></li><li class="toc-item toc-level-2"><a class="toc-link" href="#IDEA-%E9%9B%86%E6%88%90%E4%BD%BF%E7%94%A8SVN"><span class="toc-number">3.</span> <span class="toc-text">IDEA 集成使用SVN</span></a><ol class="toc-child"><li class="toc-item toc-level-3"><a class="toc-link" href="#%E9%85%8D%E7%BD%AESVN%E7%8E%AF%E5%A2%83"><span class="toc-number">3.1.</span> <span class="toc-text">配置SVN环境</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#IDEA-Git%E8%BD%ACSVN"><span class="toc-number">3.2.</span> <span class="toc-text">IDEA Git转SVN</span></a><ol class="toc-child"><li class="toc-item toc-level-4"><a class="toc-link" href="#%E6%A3%80%E7%B4%A2%E9%A1%B9%E7%9B%AE"><span class="toc-number">3.2.1.</span> <span class="toc-text">检索项目</span></a></li><li class="toc-item toc-level-4"><a class="toc-link" href="#%E6%8F%90%E4%BA%A4%E4%BB%A3%E7%A0%81"><span class="toc-number">3.2.2.</span> <span class="toc-text">提交代码</span></a></li><li class="toc-item toc-level-4"><a class="toc-link" href="#%E6%9B%B4%E6%96%B0%E4%BB%A3%E7%A0%81"><span class="toc-number">3.2.3.</span> <span class="toc-text">更新代码</span></a></li><li class="toc-item toc-level-4"><a class="toc-link" href="#%E5%AF%BC%E5%85%A5%E9%A1%B9%E7%9B%AE"><span class="toc-number">3.2.4.</span> <span class="toc-text">导入项目</span></a></li><li class="toc-item toc-level-4"><a class="toc-link" href="#%E7%89%88%E6%9C%AC%E5%86%B2%E7%AA%81%E9%97%AE%E9%A2%98-1"><span class="toc-number">3.2.5.</span> <span class="toc-text">版本冲突问题</span></a></li></ol></li></ol></li></ol></div></div><div class="card-widget card-recent-post"><div class="item-headline"><i class="fas fa-history"></i><span>Recent Post</span></div><div class="aside-list"><div class="aside-list-item no-cover"><div class="content"><a class="title" href="/bk/2024/02/05/SpringIOC%E7%9A%84%E7%90%86%E8%A7%A3/" title="SpringIOC的理解">SpringIOC的理解</a><time datetime="2024-02-05T14:26:55.000Z" title="Created 2024-02-05 22:26:55">2024-02-05</time></div></div><div class="aside-list-item no-cover"><div class="content"><a class="title" href="/bk/2024/01/18/%E3%80%90ai%E3%80%91chatgpt%E7%BB%95%E5%BC%80%E6%A3%80%E6%9F%A5%E8%BF%87%E6%BB%A4/" title="【ai】chatgpt绕开检查过滤">【ai】chatgpt绕开检查过滤</a><time datetime="2024-01-18T15:55:53.000Z" title="Created 2024-01-18 23:55:53">2024-01-18</time></div></div><div class="aside-list-item no-cover"><div class="content"><a class="title" href="/bk/2024/01/15/%E3%80%90ai%E6%A8%A1%E5%9E%8B%E3%80%91%E5%88%A4%E6%96%AD%E8%AF%AD%E5%8F%A5%E7%9A%84%E7%A7%AF%E6%9E%81%E6%80%A7%E4%B8%8E%E6%B6%88%E6%9E%81%E6%80%A7/" title="【ai模型】判断语句的积极性与消极性">【ai模型】判断语句的积极性与消极性</a><time datetime="2024-01-15T13:10:14.000Z" title="Created 2024-01-15 21:10:14">2024-01-15</time></div></div><div class="aside-list-item no-cover"><div class="content"><a class="title" href="/bk/2023/12/21/%E3%80%90%E5%8C%BA%E5%9D%97%E9%93%BE%E3%80%91%E4%BB%A5%E5%A4%AA%E5%9D%8A%E6%99%BA%E8%83%BD%E5%90%88%E7%BA%A6/" title="【区块链】以太坊智能合约">【区块链】以太坊智能合约</a><time datetime="2023-12-21T13:36:30.000Z" title="Created 2023-12-21 21:36:30">2023-12-21</time></div></div><div class="aside-list-item no-cover"><div class="content"><a class="title" href="/bk/2023/12/21/%E3%80%90Activiti7%E3%80%91%E5%B7%A5%E4%BD%9C%E6%B5%81%E4%BD%BF%E7%94%A8/" title="【Activiti7】工作流使用">【Activiti7】工作流使用</a><time datetime="2023-12-21T13:21:01.000Z" title="Created 2023-12-21 21:21:01">2023-12-21</time></div></div></div></div></div></div></main><footer id="footer"><div id="footer-wrap"><div class="copyright">&copy;2020 - 2024 By cwh</div><div class="framework-info"><span>Framework </span><a target="_blank" rel="noopener" href="https://hexo.io">Hexo</a><span class="footer-separator">|</span><span>Theme </span><a target="_blank" rel="noopener" href="https://github.com/jerryc127/hexo-theme-butterfly">Butterfly</a></div></div></footer></div><div id="rightside"><div id="rightside-config-hide"><button id="readmode" type="button" title="Read Mode"><i class="fas fa-book-open"></i></button><button id="darkmode" type="button" title="Switch Between Light And Dark Mode"><i class="fas fa-adjust"></i></button><button id="hide-aside-btn" type="button" title="Toggle between single-column and double-column"><i class="fas fa-arrows-alt-h"></i></button></div><div id="rightside-config-show"><button id="rightside_config" type="button" title="Setting"><i class="fas fa-cog fa-spin"></i></button><button class="close" id="mobile-toc-button" type="button" title="Table Of Contents"><i class="fas fa-list-ul"></i></button><button id="go-up" type="button" title="Back To Top"><span class="scroll-percent"></span><i class="fas fa-arrow-up"></i></button></div></div><div><script src="/bk/js/utils.js"></script><script src="/bk/js/main.js"></script><script src="https://cdn.jsdelivr.net/npm/@fancyapps/ui/dist/fancybox/fancybox.umd.min.js"></script><div class="js-pjax"></div><script id="click-show-text" src="https://cdn.jsdelivr.net/npm/butterfly-extsrc/dist/click-show-text.min.js" data-mobile="false" data-text="offer" data-fontsize="15px" data-random="false" async="async"></script><script async data-pjax src="//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js"></script></div></body></html>